From bdd655c7ab4fcf01d96faa544f85be9cfd58eba0 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Wed, 2 May 2001 05:25:09 +0000 Subject: [PATCH] fix bug in dropping columns. Moving columns now basically works modula Tue May 1 09:21:23 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column): fix bug in dropping columns. Moving columns now basically works modula some fine tuning. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktreeview.c | 11 ++++++++--- 8 files changed, 50 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe9a9760fa..5d14700783 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue May 1 09:21:23 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column): + fix bug in dropping columns. Moving columns now basically works + modula some fine tuning. + Tue May 1 19:09:21 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_horizontal_autoscroll): Add diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index fe9a9760fa..5d14700783 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Tue May 1 09:21:23 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column): + fix bug in dropping columns. Moving columns now basically works + modula some fine tuning. + Tue May 1 19:09:21 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_horizontal_autoscroll): Add diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fe9a9760fa..5d14700783 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Tue May 1 09:21:23 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column): + fix bug in dropping columns. Moving columns now basically works + modula some fine tuning. + Tue May 1 19:09:21 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_horizontal_autoscroll): Add diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index fe9a9760fa..5d14700783 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Tue May 1 09:21:23 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column): + fix bug in dropping columns. Moving columns now basically works + modula some fine tuning. + Tue May 1 19:09:21 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_horizontal_autoscroll): Add diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fe9a9760fa..5d14700783 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Tue May 1 09:21:23 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column): + fix bug in dropping columns. Moving columns now basically works + modula some fine tuning. + Tue May 1 19:09:21 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_horizontal_autoscroll): Add diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fe9a9760fa..5d14700783 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Tue May 1 09:21:23 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column): + fix bug in dropping columns. Moving columns now basically works + modula some fine tuning. + Tue May 1 19:09:21 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_horizontal_autoscroll): Add diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fe9a9760fa..5d14700783 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Tue May 1 09:21:23 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column): + fix bug in dropping columns. Moving columns now basically works + modula some fine tuning. + Tue May 1 19:09:21 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_horizontal_autoscroll): Add diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 284d2a063f..b88c549fa2 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -1322,9 +1322,11 @@ gtk_tree_view_button_release_drag_column (GtkWidget *widget, tree_view->priv->drag_column_x, tree_view->priv->drag_column->button->allocation.y); gtk_widget_set_parent_window (tree_view->priv->drag_column->button, tree_view->priv->header_window); + gtk_widget_size_allocate (tree_view->priv->drag_column->button, &allocation); - if (tree_view->priv->cur_reorder->left_column != tree_view->priv->drag_column) + if (tree_view->priv->cur_reorder && + tree_view->priv->cur_reorder->left_column != tree_view->priv->drag_column) gtk_tree_view_move_column_after (tree_view, tree_view->priv->drag_column, tree_view->priv->cur_reorder->left_column); tree_view->priv->drag_column = NULL; @@ -1335,6 +1337,7 @@ gtk_tree_view_button_release_drag_column (GtkWidget *widget, tree_view->priv->column_drag_info = NULL; gdk_window_hide (tree_view->priv->drag_highlight_window); + GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_DRAG); return TRUE; } @@ -6023,14 +6026,16 @@ gtk_tree_view_move_column_after (GtkTreeView *tree_view, { column_list_el->prev = NULL; column_list_el->next = tree_view->priv->columns; - column_list_el->next->prev = column_list_el; + if (column_list_el->next) + column_list_el->next->prev = column_list_el; tree_view->priv->columns = column_list_el; } else { column_list_el->prev = base_el; column_list_el->next = base_el->next; - column_list_el->next->prev = column_list_el; + if (column_list_el->next) + column_list_el->next->prev = column_list_el; base_el->next = column_list_el; } -- 2.30.2